Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jessica, Nora and Cristina' s Pet Shop Server #461

Open
wants to merge 28 commits into
base: pet-shop-server
Choose a base branch
from
Open

Jessica, Nora and Cristina' s Pet Shop Server #461

wants to merge 28 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Dec 15, 2014

No description provided.

JessicaMeyer and others added 28 commits December 12, 2014 10:34
@JessicaMeyer
first commit
91f4958
@RenaissanceAI
add server.rb and lib etc
8d43b78
@RenaissanceAI
change name into seed_db cristia->jessica and password 1234->123
8620e53
@RenaissanceAI
fix merging issues
2b868cc
@RenaissanceAI
fix merging issues
b25949d
@RenaissanceAI
fix merging issues
a09dc5b
@LadyNorm
fix merge issues
d714426
@LadyNorm
fix merge conflicts
fc6f835
@JessicaMeyer
add updated cat/dog tables
97d5485
@LadyNorm
Merge branch 'pet-shop-server' of https://github.com/JessicaMeyer/rub…
6dfe362 
…y-course into pet-shop-server
@LadyNorm
update dog/cat/shop repos
ce6b6ad
@RenaissanceAI
remove restclient and add seed_shops
a52496b
@RenaissanceAI
fix merging issues
3373f99
@RenaissanceAI
add shops_repo
acc1d45
@RenaissanceAI
test petshop
c25fdad
@RenaissanceAI
change update tables dogs and cats
6e02a8d
@JessicaMeyer
setup rspec and add spec files
6deabf5
@JessicaMeyer
set up rspec and add spec files
0345d8f
@LadyNorm
correct repo location
7c6684a
@RenaissanceAI
change update tables dogs and cats
448712d
@RenaissanceAI
Merge branch 'pet-shop-server' of https://github.com/JessicaMeyer/rub…
a7eb2e0 
…y-course into pet-shop-server
@RenaissanceAI
load cats and dogs
b30dfae
@RenaissanceAI
make shops cats dogs viewable to all
6ac3663
@RenaissanceAI
add cats and dogs db requests
fd87abf
@RenaissanceAI
fixed adopted link and added
ad1eea6
@RenaissanceAI
fix server.rb
3f612a5
@RenaissanceAI
fix petshopserver.rb add adopt and find pets by user_id
73e3b67
@RenaissanceAI
clean up server.rb
38dbcd8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JessicaMeyer @RenaissanceAI @LadyNorm